added optimized permutator for going from cairo's buffer format to RGBA

* extensions/gegl-fixups.c: (conv_bgrA8_rgba8), (init): added
optimized permutator for going from cairo's buffer format to RGBA byte
order, as well as unpremultiplying.

svn path=/trunk/; revision=201

diff --git a/ChangeLog b/ChangeLog
index fbbb4750c2e759ea924a386db36c0ce744ef8d38..6c219bb2007c27631f333d30e68c4c9bfb4ee91a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-01-28  Øyvind Kolås  <pippin@gimp.org>
+
+       * extensions/gegl-fixups.c: (conv_bgrA8_rgba8), (init): added
+       optimized permutator for going from cairo's buffer format to RGBA byte
+       order, as well as unpremultiplying.
+
 2007-01-28  Øyvind Kolås  <pippin@gimp.org>
 
        * extensions/gegl-fixups.c: fixed gamma conversion.

diff --git a/extensions/gegl-fixups.c b/extensions/gegl-fixups.c
index 07a721d7b0e18d91bf2e3ede48e3ca9f2eee359e..0264a405228c908e4953c9c3eeef0eb1a53342e7 100644 (file)
--- a/extensions/gegl-fixups.c
+++ b/extensions/gegl-fixups.c
@@ -82,7 +82,6 @@ static float table_8g_F[1 << 8];
 static unsigned char table_F_8[1 << 16];
 static unsigned char table_F_8g[1 << 16];
 
-
 static int table_inited = 0;
 
 static void
@@ -443,6 +442,27 @@ conv_rgbAF_rgb8 (unsigned char *srcc,
   return samples;
 }
 
+static long
+conv_bgrA8_rgba8 (unsigned char *srcc,
+                  unsigned char *dstc,
+                  long           samples)
+{
+  unsigned char *src = (void*)srcc;
+  unsigned char *dst = (void*)dstc;
+  long n=samples;
+  while (n--)
+    {
+      unsigned char alpha=src[3];
+      dst[0]=alpha?(src[2]*255/alpha):0;
+      dst[1]=alpha?(src[1]*255/alpha):0;
+      dst[2]=alpha?(src[0]*255/alpha):0;
+      dst[3]=alpha;
+      src+=4;
+      dst+=4;
+    }
+  return samples;
+}
+
 
 #define conv_rgb8_rgbAF conv_rgb8_rgbaF
 
@@ -475,6 +495,14 @@ init (void)
       babl_component ("B'"),
       babl_component ("A"),
       NULL);
+  Babl *bgrA8 = babl_format_new (
+      babl_model ("R'aG'aB'aA"),
+      babl_type  ("u8"),
+      babl_component ("B'a"),
+      babl_component ("G'a"),
+      babl_component ("R'a"),
+      babl_component ("A"),
+      NULL);
   Babl *rgb8 = babl_format_new (
       babl_model ("R'G'B'"),
       babl_type  ("u8"),
@@ -503,6 +531,7 @@ init (void)
   o (rgbaF, rgb8);
   o (rgbAF, rgb8);
   o (rgbAF, sdl32);
+  o (bgrA8, rgba8);
 
   return 0;
 }